gpx: when writing multi-mode, order of rte and trk was reversed.

Regenerate various reference/igc* gpx files to validate.

diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index 9f6c5a38baa0bd3ba9c013248b45e109bc46ddc1..41f9f1a2efd0de950c1fa47970b3a1c8ca27038b 100644 (file)
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -1268,8 +1268,8 @@ gpx_write(void)
        }
 
        waypt_disp_all(gpx_waypt_pr);
-       gpx_track_pr();
        gpx_route_pr();
+       gpx_track_pr();
 
        fprintf(ofd, "</gpx>\n");
 }

diff --git a/gpsbabel/reference/igc1.gpx b/gpsbabel/reference/igc1.gpx
index 35191c176ec5a5b5c27070a3f42866c1cfed21ba..63e3ef55d200f30a1d23b071a705b344b88880bc 100644 (file)
--- a/gpsbabel/reference/igc1.gpx
+++ b/gpsbabel/reference/igc1.gpx
@@ -1,30 +1,45 @@
 <?xml version="1.0"?>
 <gpx
  version="1.0"
-creator="GPSBabel - http://gpsbabel.sourceforge.net"
+creator="GPSBabel - http://www.gpsbabel.org"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns="http://www.topografix.com/GPX/1/0"
 xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
-<time>2004-08-25T09:57:00Z</time>
-<bounds minlat="-35.498071" minlon ="148.115814" maxlat="-27.755478" maxlon="153.042490" />
-<wpt lat="-29.480116" lon="150.133619">
+<time>2005-01-18T18:58:35Z</time>
+<bounds minlat="-30.342870000" minlon ="149.746093000" maxlat="-27.755478000" maxlon="150.477059000" />
+<wpt lat="-29.480116000" lon="150.133619000">
   <name>PALLMG</name>
   <cmt>PALLMG</cmt>
   <desc>PALLMG</desc>
   <sym>dot</sym>
 </wpt>
-<wpt lat="-27.755478" lon="149.746093">
+<wpt lat="-27.755478000" lon="149.746093000">
   <name>PILOT</name>
   <cmt>CHRIS JONES</cmt>
   <desc>CHRIS JONES</desc>
   <sym>dot</sym>
 </wpt>
-<wpt lat="-30.342870" lon="150.477059">
+<wpt lat="-30.342870000" lon="150.477059000">
   <name>PLUMTH</name>
   <cmt>PLUMTHORPE LOC</cmt>
   <desc>PLUMTHORPE LOC</desc>
   <sym>dot</sym>
 </wpt>
+<rte>
+  <name>AB1</name>
+  <rtept lat="-30.675867" lon="150.609035">
+    <ele>0.000000</ele>
+    <name>BORAH </name>
+  </rtept>
+  <rtept lat="-30.729929" lon="150.649193">
+    <ele>0.000000</ele>
+    <name>BALDWI</name>
+  </rtept>
+  <rtept lat="-30.763677" lon="150.723195">
+    <ele>0.000000</ele>
+    <name>MANAIR</name>
+  </rtept>
+</rte>
 <trk>
 <trkseg>
 <trkpt lat="-30.747492" lon="150.720524">
@@ -531,19 +546,4 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
 </trkpt>
 </trkseg>
 </trk>
-<rte>
-  <name>AB1</name>
-  <rtept lat="-30.675867" lon="150.609035">
-    <ele>0.000000</ele>
-    <name>BORAH </name>
-  </rtept>
-  <rtept lat="-30.729929" lon="150.649193">
-    <ele>0.000000</ele>
-    <name>BALDWI</name>
-  </rtept>
-  <rtept lat="-30.763677" lon="150.723195">
-    <ele>0.000000</ele>
-    <name>MANAIR</name>
-  </rtept>
-</rte>
 </gpx>

diff --git a/gpsbabel/reference/igc1_gpx.out b/gpsbabel/reference/igc1_gpx.out
index 9dc64d8885378ef1c802522a7b84e501ec046336..c88087656f3b93aec80e8468b5cfc40a10f9775b 100644 (file)
--- a/gpsbabel/reference/igc1_gpx.out
+++ b/gpsbabel/reference/igc1_gpx.out
@@ -6,6 +6,30 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns="http://www.topografix.com/GPX/1/0"
 xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
 <time>1970-01-01T00:00:00Z</time>
+<rte>
+  <name>0001</name>
+  <desc>IGCDATE000000: </desc>
+  <rtept lat="-30.675867" lon="150.609033">
+    <name>TAKEOFF</name>
+    <cmt>BORAH </cmt>
+  </rtept>
+  <rtept lat="-30.675867" lon="150.609033">
+    <name>START</name>
+    <cmt>BORAH </cmt>
+  </rtept>
+  <rtept lat="-30.729933" lon="150.649200">
+    <name>TURN01</name>
+    <cmt>BALDWI</cmt>
+  </rtept>
+  <rtept lat="-30.763683" lon="150.723200">
+    <name>FINISH</name>
+    <cmt>MANAIR</cmt>
+  </rtept>
+  <rtept lat="-30.763683" lon="150.723200">
+    <name>LANDING</name>
+    <cmt>MANAIR</cmt>
+  </rtept>
+</rte>
 <trk>
   <name>GNSSALTTRK</name>
   <desc>IGCHDRS~HFPLTPILOT:CHRIS JONES~</desc>
@@ -351,28 +375,4 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
 </trkpt>
 </trkseg>
 </trk>
-<rte>
-  <name>0001</name>
-  <desc>IGCDATE000000: </desc>
-  <rtept lat="-30.675867" lon="150.609033">
-    <name>TAKEOFF</name>
-    <cmt>BORAH </cmt>
-  </rtept>
-  <rtept lat="-30.675867" lon="150.609033">
-    <name>START</name>
-    <cmt>BORAH </cmt>
-  </rtept>
-  <rtept lat="-30.729933" lon="150.649200">
-    <name>TURN01</name>
-    <cmt>BALDWI</cmt>
-  </rtept>
-  <rtept lat="-30.763683" lon="150.723200">
-    <name>FINISH</name>
-    <cmt>MANAIR</cmt>
-  </rtept>
-  <rtept lat="-30.763683" lon="150.723200">
-    <name>LANDING</name>
-    <cmt>MANAIR</cmt>
-  </rtept>
-</rte>
 </gpx>

diff --git a/gpsbabel/reference/igc2_gpx.out b/gpsbabel/reference/igc2_gpx.out
index 6b2e340876814e37c3ca7b08d39a6a27fa0a17de..da688c349fb35c0ecb6f55861751be49d0c41c23 100644 (file)
--- a/gpsbabel/reference/igc2_gpx.out
+++ b/gpsbabel/reference/igc2_gpx.out
@@ -6,6 +6,40 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns="http://www.topografix.com/GPX/1/0"
 xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
 <time>1970-01-01T00:00:00Z</time>
+<rte>
+  <name>0001</name>
+  <desc>IGCDATE160701: 500KTri</desc>
+  <rtept lat="51.189317" lon="-1.031650">
+<time>2001-07-15T21:38:41Z</time>
+    <name>TAKEOFF</name>
+    <cmt>LashamClubhouse</cmt>
+  </rtept>
+  <rtept lat="51.169650" lon="-1.044067">
+<time>2001-07-15T21:38:41Z</time>
+    <name>START</name>
+    <cmt>LashamStart S Start</cmt>
+  </rtept>
+  <rtept lat="52.151533" lon="-2.920450">
+<time>2001-07-15T21:38:41Z</time>
+    <name>TURN01</name>
+    <cmt>Sarnesfield TP1</cmt>
+  </rtept>
+  <rtept lat="52.502450" lon="-0.293533">
+<time>2001-07-15T21:38:41Z</time>
+    <name>TURN02</name>
+    <cmt>NormanCross TP2</cmt>
+  </rtept>
+  <rtept lat="51.169650" lon="-1.044067">
+<time>2001-07-15T21:38:41Z</time>
+    <name>FINISH</name>
+    <cmt>LashamStart S Finish</cmt>
+  </rtept>
+  <rtept lat="51.189317" lon="-1.031650">
+<time>2001-07-15T21:38:41Z</time>
+    <name>LANDING</name>
+    <cmt>LashamClubhouse</cmt>
+  </rtept>
+</rte>
 <trk>
   <name>PRESALTTRK</name>
   <desc>IGCHDRS~HFFXA035~HFPLTPILOT:Bill Bloggs~HFGTYGLIDERTYPE:Schleicher ASH-25~HFGIDGLIDERID:ABCD-1234~HFDTM100GPSDATUM:WGS-1984~HFRFWFIRMWAREVERSION:6.4~HFRHWHARDWAREVERSION:3.0~HFFTYFRTYPE:Manufacturer Model~HFGPSMarconiCanada:Superstar 12ch max10000m~HFPRSPRESSALTSENSOR:Sensyn XYZ1111 max11000m~HFCIDCOMPETITIONID:XYZ-78910~HFCCLCOMPETITIONCLASS:15mMotor Glider~HFSCMSECONDCREW:JohnSmith~</desc>
@@ -90,38 +124,4 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
 </trkpt>
 </trkseg>
 </trk>
-<rte>
-  <name>0001</name>
-  <desc>IGCDATE160701: 500KTri</desc>
-  <rtept lat="51.189317" lon="-1.031650">
-<time>2001-07-15T21:38:41Z</time>
-    <name>TAKEOFF</name>
-    <cmt>LashamClubhouse</cmt>
-  </rtept>
-  <rtept lat="51.169650" lon="-1.044067">
-<time>2001-07-15T21:38:41Z</time>
-    <name>START</name>
-    <cmt>LashamStart S Start</cmt>
-  </rtept>
-  <rtept lat="52.151533" lon="-2.920450">
-<time>2001-07-15T21:38:41Z</time>
-    <name>TURN01</name>
-    <cmt>Sarnesfield TP1</cmt>
-  </rtept>
-  <rtept lat="52.502450" lon="-0.293533">
-<time>2001-07-15T21:38:41Z</time>
-    <name>TURN02</name>
-    <cmt>NormanCross TP2</cmt>
-  </rtept>
-  <rtept lat="51.169650" lon="-1.044067">
-<time>2001-07-15T21:38:41Z</time>
-    <name>FINISH</name>
-    <cmt>LashamStart S Finish</cmt>
-  </rtept>
-  <rtept lat="51.189317" lon="-1.031650">
-<time>2001-07-15T21:38:41Z</time>
-    <name>LANDING</name>
-    <cmt>LashamClubhouse</cmt>
-  </rtept>
-</rte>
 </gpx>